bitkeeper revision 1.1159.170.49 (419cc054DpxjFgLktm6GX49IM6rQhg)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Thu, 18 Nov 2004 15:31:32 +0000 (15:31 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Thu, 18 Nov 2004 15:31:32 +0000 (15:31 +0000)
Merge scramble.cl.cam.ac.uk:/auto/groups/xeno/BK/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/auto/groups/xeno/BK/xen-unstable.bk


Trivial merge